Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Run DWCO and CO in a same pod but different containers #745

Merged
merged 7 commits into from
Jul 1, 2021
Merged

Conversation

tolusha
Copy link
Contributor

@tolusha tolusha commented Mar 29, 2021

Signed-off-by: Anatolii Bazko [email protected]

What does this PR do?

Screenshot/screencast of this PR

N/A

What issues does this PR fix or reference?

eclipse-che/che#19402

How to test this PR?

  1. run ./deploy.sh and check if all components have been deployed.

PR Checklist

As the author of this Pull Request I made sure that:

Reviewers

Reviewers, please comment how you tested the PR when approving it.

@openshift-ci-robot
Copy link

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@codecov-io
Copy link

codecov-io commented Mar 29, 2021

Codecov Report

Merging #745 (56f88e6) into main (f8fd11b) will decrease coverage by 0.06%.
The diff coverage is 68.29%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #745      +/-   ##
==========================================
- Coverage   47.40%   47.33%   -0.07%     
==========================================
  Files          54       54              
  Lines        5578     5563      -15     
==========================================
- Hits         2644     2633      -11     
+ Misses       2612     2607       -5     
- Partials      322      323       +1     
Impacted Files Coverage Δ
pkg/util/util.go 7.46% <0.00%> (+0.05%) ⬆️
pkg/deploy/dev-workspace/dev_workspace.go 66.25% <80.00%> (-1.36%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f8fd11b...56f88e6. Read the comment docs.

@openshift-ci-robot
Copy link

@tolusha: PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: tolusha

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tolusha
Copy link
Contributor Author

tolusha commented Apr 29, 2021

/retest

@tolusha tolusha changed the title Run DWCO in a separate pod [WIP] Run DWCO in a separate pod Apr 29, 2021
Copy link
Contributor

@metlos metlos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As is at the moment, even with the suggestion below, the DWCO container does not work because the script doesn't install the CheManagers CRD into the cluster. Not sure if and how that is done in chectl or OLM.

deploy/operator.yaml Show resolved Hide resolved
@tolusha
Copy link
Contributor Author

tolusha commented Jun 17, 2021

@metlos
I don't understand. Could you elaborate more ?

@tolusha
Copy link
Contributor Author

tolusha commented Jun 18, 2021

/test v7-single-host-nightly-deployment

@tolusha
Copy link
Contributor Author

tolusha commented Jun 18, 2021

/test v7-devworkspace-happy-path

@metlos
Copy link
Contributor

metlos commented Jun 18, 2021

@metlos
I don't understand. Could you elaborate more ?

When I run ./deploy.sh, the CheCluster is set up with spec.devWorkspace.enable = false. This means that che-operator never deploys the CheManager or DevworkspaceRouting CRDs and thus the deployment enters a crash loop because the devworkspace-che container never successfully starts.

@metlos
Copy link
Contributor

metlos commented Jun 22, 2021

Note that I implemented the necessary waiting logic in devworkspace-che as part of che-incubator/devworkspace-che-operator#49.

@tolusha
Copy link
Contributor Author

tolusha commented Jun 24, 2021

@metlos
Cool, Thank you.
I've rebased the pr

tolusha added 3 commits June 25, 2021 11:37
commit 3379b56
Author: Anatolii Bazko <[email protected]>
Date:   Fri Jun 18 15:14:24 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit ea05ba6
Author: Anatolii Bazko <[email protected]>
Date:   Thu Jun 17 12:13:24 2021 +0300

    Fix deployment

    Signed-off-by: Anatolii Bazko <[email protected]>

commit d10d6cf
Author: Anatolii Bazko <[email protected]>
Date:   Tue Jun 15 13:15:05 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 671bea2
Author: Anatolii Bazko <[email protected]>
Date:   Mon Jun 14 13:04:56 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 79b1f5a
Author: Anatolii Bazko <[email protected]>
Date:   Mon Jun 14 11:25:29 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 5f86f7e
Author: Anatolii Bazko <[email protected]>
Date:   Fri Jun 11 15:35:48 2021 +0300

    Fix

    Signed-off-by: Anatolii Bazko <[email protected]>

commit bdf4169
Author: Anatolii Bazko <[email protected]>
Date:   Fri Jun 11 15:08:54 2021 +0300

    Fix

    Signed-off-by: Anatolii Bazko <[email protected]>

commit e2bf657
Author: Anatolii Bazko <[email protected]>
Date:   Fri Jun 11 13:06:28 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 801cbea
Author: Anatolii Bazko <[email protected]>
Date:   Fri Jun 11 12:53:31 2021 +0300

    Fix

    Signed-off-by: Anatolii Bazko <[email protected]>

commit aaba38d
Author: Anatolii Bazko <[email protected]>
Date:   Fri Jun 11 12:18:11 2021 +0300

    Update nightly bundle

    Signed-off-by: Anatolii Bazko <[email protected]>

commit b170171
Author: Anatolii Bazko <[email protected]>
Date:   Thu May 27 10:54:59 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 275e1d3
Author: Anatolii Bazko <[email protected]>
Date:   Thu May 27 09:26:08 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 8a1abd1
Author: Anatolii Bazko <[email protected]>
Date:   Mon May 24 12:23:18 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 4c4184a
Author: Anatolii Bazko <[email protected]>
Date:   Mon May 24 11:23:56 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 8f3ae51
Author: Anatolii Bazko <[email protected]>
Date:   Mon May 24 11:17:58 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 052fd91
Author: Anatolii Bazko <[email protected]>
Date:   Fri May 21 17:48:24 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit c12154c
Author: Anatolii Bazko <[email protected]>
Date:   Fri May 21 17:40:13 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 8591e8c
Author: Anatolii Bazko <[email protected]>
Date:   Fri May 21 14:07:27 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 77af3b1
Author: Anatolii Bazko <[email protected]>
Date:   Fri May 21 11:26:42 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit fd1b656
Author: Anatolii Bazko <[email protected]>
Date:   Thu May 20 16:36:28 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 994b19b
Author: Anatolii Bazko <[email protected]>
Date:   Wed May 19 16:32:34 2021 +0300

    Update nightly bundle

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 77d7bef
Author: Anatolii Bazko <[email protected]>
Date:   Wed May 19 16:25:25 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit e7b3a4c
Author: Anatolii Bazko <[email protected]>
Date:   Wed May 5 14:39:19 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit e374a44
Author: Anatolii Bazko <[email protected]>
Date:   Fri Apr 30 14:24:25 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 1d3b4d7
Author: Anatolii Bazko <[email protected]>
Date:   Fri Apr 30 12:54:40 2021 +0300

    Fix

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 72dbed2
Author: Anatolii Bazko <[email protected]>
Date:   Fri Apr 30 11:40:29 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 76fa6af
Author: Anatolii Bazko <[email protected]>
Date:   Thu Apr 29 16:28:07 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 12a291c
Author: Anatolii Bazko <[email protected]>
Date:   Wed Apr 28 14:06:09 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 4202883
Author: Anatolii Bazko <[email protected]>
Date:   Tue Apr 27 16:17:44 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 6c20e16
Author: Anatolii Bazko <[email protected]>
Date:   Tue Apr 27 11:58:19 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 0464954
Author: Anatolii Bazko <[email protected]>
Date:   Tue Apr 27 11:58:07 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit ae7d93b
Author: Anatolii Bazko <[email protected]>
Date:   Mon Apr 26 20:18:18 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit e21b4c3
Author: Anatolii Bazko <[email protected]>
Date:   Mon Apr 26 15:49:10 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 35f4e28
Author: Anatolii Bazko <[email protected]>
Date:   Mon Apr 26 14:40:06 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 9aa66ef
Author: Anatolii Bazko <[email protected]>
Date:   Mon Apr 26 14:40:00 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit d8fbb7c
Author: Anatolii Bazko <[email protected]>
Date:   Mon Apr 26 13:19:52 2021 +0300

    Fixes

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 6b3fec8
Author: Anatolii Bazko <[email protected]>
Date:   Wed Apr 21 12:29:49 2021 +0300

    Fix

    Signed-off-by: Anatolii Bazko <[email protected]>

commit 59351fb
Author: Anatolii Bazko <[email protected]>
Date:   Mon Mar 29 15:15:05 2021 +0300

    Run DWCO in a separate pod

    Signed-off-by: Anatolii Bazko <[email protected]>
Signed-off-by: Anatolii Bazko <[email protected]>
Signed-off-by: Anatolii Bazko <[email protected]>
Signed-off-by: Anatolii Bazko <[email protected]>
Copy link
Contributor

@metlos metlos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've tested this extensively together with #868 and che-incubator/devworkspace-che-operator#49 (implementing eclipse-che/che#19402 and eclipse-che/che#19847) and everything seems to be working.

@openshift-ci
Copy link

openshift-ci bot commented Jun 29, 2021

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: metlos, tolusha

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci
Copy link

openshift-ci bot commented Jun 30, 2021

New changes are detected. LGTM label has been removed.

@openshift-ci openshift-ci bot removed the lgtm label Jun 30, 2021
@metlos
Copy link
Contributor

metlos commented Jun 30, 2021

/test v8-che-behind-proxy

@tolusha
Copy link
Contributor Author

tolusha commented Jul 1, 2021

@metlos
Feel free to merge when needed

@metlos metlos merged commit 65e3cac into main Jul 1, 2021
@metlos metlos deleted the 19402 branch July 1, 2021 20:36
@che-bot che-bot added this to the 7.33 milestone Jul 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants